Bug 48512: Fix more API stupidity

Change-Id: Id3cb6fcf3c7bc268ddab4edb5bade56a7a595b73
Merge "Bug 48512: Fix more API stupidity"