Bugfix an error with the manual merge.

From commit 3e0f3af362fae2bc140b99678df5d775e97b1159, which required a manual merge, resulting in that commit looking horrendous.