Make these non inline.

Don't do this please...

Change-Id: Id90490622bca10beabf7a1c92e51e55bc72a1db8