Bug 1069608 remove workaround