Revert "Fixed API NPE."

This reverts commit 1654b8cc3ff7d849ec3e3e0d38dff08944c191c7.
Lets try that again.