Revert e66b303..1088a23

This rolls back to commit e66b30326f56d065fa4f08deed89d0d0f2688c02.