Revert "SemGen Refactor to date"

This reverts commit a9a901d427c3a2942a54a02d83c7c93028e2aebd.