Revert e38a803..0d65d9f

This rolls back to commit e38a8034fd4abf29d1f1b5df42464100d1d3fece.