and revert the last two commits again to keep output compatibility