NH-2611

https://nhibernate.jira.com/browse/NH-2611
Can we move this to a factory(or other place where all such things are created)?