Revert 66bf572..cf9e704

This rolls back to commit 66bf5727887699fd1fd8faa18e14b97fc33bfa7e.