Ooopsie fixed overly aggressive refactoring

Had removed prematurely a function that was required. Shame on me.