Back out fee79a593fd3 and 2c8930343985 (bug 825341) for having probably needed-clobber