Fixed broken merged patch.