revert preemptive template fixes