Fixes api stuff. This reverts commit f2d248db80. Change-Id: I75c05a17ebde4f245e1f3e0cc22e622d06534c4b
f2d248db80