Revert "Merging r310983:"

This reverts commit 923bd8236e1a0c6009de8d932bf9a0da7ec94b58.

Revert all changed related to r310983. This introduces an ABI break that we don't want, but it also introduces build issues that we haven't fixed yet. Revert at least until we figure the build issues out.
11 files changed