Revert "Merge commit '1884960242f835879f5ca6504659072a2305f120' into release4.14.0"

This reverts commit 7a051584552d332fc27e743b6ef83864a0737e53, reversing
changes made to 1884960242f835879f5ca6504659072a2305f120.