This reverts commit 003e292f98 because there were dependent changes in the codebase that now fail.
003e292f98