Revert "BRANCH 4.1:"

This reverts commit ec44a0f61aae65d1dd874d9a00ade8aa2252c6cc.