Revert 351b2d2..3ddddf4

This rolls back to commit 351b2d2bf781787e58211c2c582c2eddacea7e65.