Backed out changeset 305689497e3e (bug 650161) for causing LeakSanitizer failures