Revert f8a3e47..cb56fa9

This rolls back to commit f8a3e47aed9caeb51d0958774847e285ea6a810e.