Revert https://github.com/apache/beam/pull/11122 which is a potential regression

This is potentially a regression for Dataflow. We should revert and re-introduce as an optional change that can be controlled by a user option.