revert unnecessary diff
fix an assertion