Remove workaround for issue 10313
Get rid of templates just for attribute inference
Merge pull request #1742 from 9rnsr/fix10313

Remove workaround for issue 10313