Backed out changeset 972daa5dd3c5 (bug 1027720) for build failures