Port 1002593 to 1.4
Merge pull request #20326 from russnicoletti/Bug-1002593-v1.4

Port Bug 1002593 to v1.4 r=djf