This reverts commit 7dcd0ea6 due to issues reported postcommit with the correctness of truncated cttzs.