Revert previous massive API breaking commit.

Sorry, simply not going to go through every line and fix it.
This reverts commit 5d9739662faae8fcac05d29b32b07c38c641a752.