Revert 148fb0e..b3e52b7

This rolls back to commit 148fb0eec678abeb553cb09c055982e9c0ce2bdb.