Removed deprecation annotation
Revert incorrect fixes
Merge pull request #6693 from GrahamForks/4.2-mutator-fix

[4.2] Removed Deprecation Annotation
Merge branch '4.2'