Backed out changesets cf87c5c76627 and 1ab1fff092a5 (bug 802266) for bustage.
CLOSED TREE