Revert: Backport #746 to the 3.0 line (efcfc54e4a273aba16a20af107416869be22dcd4)