Revert 04f8956
The inconsistent compare function errors are due to user error, not engine error.