This is a regression introduced in commit 84439a87 (partially reverted in commit 9a2da538 but some pieces were missing!).