Revert e2b51f0..e84415e

This rolls back to commit e2b51f0bb99d0ca962e7058c39a270aa540f531e.