back out bug 874721, bug 899435
merge backout, a=me
merge backout, a=me