Fix conflict with another recent patch.