Backed out changeset 7fc9c8f622c5 (bug 837870) because it broke the build, landing on a CLOSED TREE