This PR removes 2c9862e1 (cherry picked from ef383322) from the release/3.0.x branch. This is dependent on #1569 which is scheduled for inclusion first in 3.1.0.
release/3.0.x