#10013: Rolling back accidental commit of Adrian's template system changes (got in through the code style improvements patch).