Fix typo in rebase of !231
I erroneously let old master code slip in the rebase...
(cherry picked from commit 7c6c1cfa38a43550e5eed0b883aacee79d4e0464)