Backed out changeset 3d51d7f54e5d (bug 825519) because of build failures