revert changes to support core

I had made these changes to support some work dasein had done in the
core project, seems since this it has been removed.