Clean up another incorrectly resolved merge conflict.
Merge stable.