Partially revert 23303952b