Revert "Switched from TSC to CIC assignment function (less accurate, but faster)"

actually TSC seems faster at same accuracy
This reverts commit 13d88a6ad0c7c60e651188f89c05f77dc52b5fa6.