Revert change and shorten version compat util name

The plan was flawed.