Bug 973484 - Remove workaround of bug 783076