reverse commenting out code in prior commit with a fix to type that was broken out into its own class.