Temporarily revert r72514 (and dependent patch r72516). It was causing this