Undeprecate funcs until we're ready for api-review am: 00a2f34c9a

Original change: undetermined

Change-Id: Ife9cae3ad6063b17a882f48a18ccfbbb1cbef579