Fixing another bad merge problem.