Revert 5052841..b33bc37

This rolls back to commit 5052841b2c0da3ea9b659f56f6ea9d59d0c4abb5.