Backed out changeset 31bc303caa56 (bug 970578) for failing to compile on many platforms, on a CLOSED TREE.