Revert unintentional API changes.

Change-Id: Ib7c2feb41a770ab530f2746eb7cd0317b82aa4fd
3 files changed