Revert e1f5e18..fca51b8

This rolls back to commit e1f5e18a59a1ccade5dfff68c46f172c1079c326.