Backed out changeset ffdd7ad47327 (bug 1074135) for mass bustage.
Backed out changeset 6ae4ca55a6d9 (bug 1059674) for mass bustage.