Remove dead code that got re-introduced when I resolved merge conflicts.