Backed out 2 changesets (bug 920840, bug 920831) for bustage. DONTBUILD

Backed out changeset dac111df7fdf (bug 920840)
Backed out changeset bfde80bc6826 (bug 920831)