tweaked backwards compatibility code

Change-Id: I474dc813324b45c654f5cda82b0cf8d11f4d045e