Revert Utility changes

Fixes #5717.