Revert "Keep generic utility classes out of core"

This reverts commit 3a04e473650385bdeb3d3276ff6db3a4807aa2f5.