Backed out changeset 61a25c10da62 (bug 1038544) for build failures