Bug 1043260 - Remove workaround done in bug 1022423
Merge pull request #22097 from crdlc/bug-1043260

Bug 1043260 - Remove workaround done in bug 1022423