Revert e5b7c87..8005063

This rolls back to commit e5b7c8798f96b764ec0edf5792b6349249c77129.