backout changeset 8b6f20bda157 (bug 735577 followup 1) for build failure