Revert e83e096..db9bd55

This rolls back to commit e83e09667a176e231b1ff748ff1b66df76106cb8.