Backout changeset 4810e8f4eb98 (part of bug 934864) for causing bug 937332.