Back to non-template form