Bug 1043260 - Remove workaround done in bug 1022423