KRACOEUS-7197

After looking into it, I could change it, but there would be a decent amount of refactoring involved over a few classes.  

I attempted to change it and ran into some issues while starting the server.

I will look into it more, but for the moment I'm going to file this under if it isn't broken, don't fix it.

Thoughts?