Revert becb91e..e9333e7

This rolls back to commit becb91e0f9c0f092e1bd76caea44f6f9a964c99f.