Redo commit 6b832cb6b12b9a6cd9dd7986672c0d8e4a0c9ea7. The change was accidentally removed in the next commit.