Backed out changeset 7fa9564a2486 (bug 974893) for build failures