Revert various aspects of previous, abandoned CTE design