Backout changeset b07c3d5ec540 (bug 1045415) because it breaks local builds; a=backout