Remove now obsolete compat code

Change-Id: I1b552aced52c4f8630fdb1a0352b51e25c893475