This fixes up 3d403f2a, by not
removing public API.

Change-Id: I60a4b7284661238bdf32a1600f27a7e507c5374a