Fix commit-merging error.

This code was supposed to be dropped when two commits were merged; apparently it wasn't.