Backed out changeset d7d7cc47bcc6 (bug 924622) for bustage.
CLOSED TREE