Backed out bug 823010 (changeset a35253e41a46). a=bustage