Revert 8c494c7..3233f1a

This rolls back to commit 8c494c7c71f65881a5295550bf0b7743a95caefd.