Backed out changeset 51ff7710ccbc (bug 966395) for assertion errors during the build