Revert "Use try lock to fix class resolution race"
am: adc538a57a

Change-Id: I5dc4f5291800c124beed080e46bfee437b40669b