Redo a6b445fd that got lost during the cleanup merge