Revert 5a0fa6d..b150a55

This rolls back to commit 5a0fa6dc505ed10abbffc0b23061a6d84bd57142.