[ci skip] wip: we are re-rendering semi-correctly now