Backed out changeset cb4cd38abdc5 (bug 945596) for bustage.
CLOSED TREE