Backed out changeset 2f94e060bac3 (bug 1012917) for Mnw bustage.
CLOSED TREE