Correction to bad merge

The merge from v2.6 to master in commit 18985643f50409ec5e91b35d2c3a740e67d553a4
seems to have gone horribly wrong. This should fix it.