Revert Revert DTK rewrite