Revert DTK rewrite