undoing Trie optimisations that seem to be causing CT dependency issues