I tried to do this but it caused build errors due to problems with the template version lower in the file.  Would be best to address this in a new issue/pull.