Bug 923544: remove unneeded workaround that was causing problems
Merge pull request #13103 from davidflanagan/bug923544

Bug 923544: remove unneeded workaround that was causing problems r=aus