a670ffcf4b
The compat code was causing a loop and is also no longer needed. Change-Id: I05025d95ecbdcada2511c4803b40a81bb0ef34de