Revert "Use java.util.Objects instead on internal API"

This reverts commit bce74c59e5e75a810d745fadb7eac1dad4e95fc5.