Revert bcf2294, fddd1f9. Master is GENERALLY all or nothing, and most "fixes" on it are for bugs not on 4.3

Change-Id: I8ae55b30f3a9abe3fe10d6dbf3cbc1ede9199c67