Reverting changes made to patched-v3.11.0pr1 that should have been made to patched-dev-3.x