Revert 04c6c7c..0d54abf

This rolls back to commit 04c6c7c2357d0a9ebbeb2bd1fd651d8e8b7d0b4d.