Correct another merge error in commit 2c2628005d62bb542c72aaed8808f2b76caaeb2f