Backout changeset 0ff383d4a899 (bug 861453) for universal builds bustage