Revert a couple of deprecations to fix broken build

Will re-deprecate in a subsequent CL

Change-Id: Ibc246e2e26a68880f3fba3aff3407404f5a57ce3
1 file changed