Unbreak the public API again...

Change-Id: I899142cec4084cead1d730328132a49e1dafe6f9