This was forgotten in 2768bc07f7 and should hopefully avoid an all too confusing rebase / merge conflict later.
2768bc07f7