Recommit simplification first attempted in r232309 (fixed a bit in r232312, with...