Revert the fix for issue #284, because it breaks other scenarios in Firefox.