Undeprecate a few functions that aren't going away

Change-Id: Ifd0199102a8316a9439f3ad931e6def9c8c4cc85
3 files changed