Remove mocking on save, when not necessary
Merge pull request #14353 from arthurnn/remove_small_mock

Remove mocking on save, when not necessary