Revert tilghman and pari's code changes, as