Revert "Draft"

This reverts commit 952f508bd8517c5effdd45e2706587787b9d858e.
Lalit Nhibernate