Revert accidental merge of unrelated not-ready-for-pr branch

This reverts commit af357efcdd052d8340c6fa87fde21d0204da9782.