Revert "Merge pull request #13338 from evanxd/bug-925961"

This reverts commit 5eff7b00f3acaef6144d050a357b6d33e46807a9.

Because this commit is causing bug 937639