Revert b4e842e..337e6ca

This rolls back to commit b4e842e0149fcd4b82d4c28c26fb84d2b5aa71f7.