Revert 09d9b43..98bbaf1

This rolls back to commit 09d9b43862f259c365d72047f8fe8de178234957.