Back out 7f84bf06751d:a3a21c01dab8 (bug 822906) and 6e334c229091:97e0102c59c0 (bug 815666) for bustage
a=backout