reverting hacks: taking out string.Equal