Backed out changeset f1068bf18e64 (bug 978913) for bustage on most platforms.
CLOSED TREE