Revert merge from 6.8 fixing #8238 since it was causing issues like #11026. Should be fixed in another way. (no-merge)

Change-Id: I232f55781daf7ab5137f9602d3a3c6c2020c6064