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

Original change: undetermined

Change-Id: I9806adda93c94ca9345023cc0d552b77a4122af9