Revert e803099..7ec10fc

This rolls back to commit e8030991c926593cc5101f5145609fca8f3fdb4e.