Backed out changeset 2af237fa2079 (bug 999704) for bustage.
CLOSED TREE DONTBUILD