#RevertPatch6.1Changes