Revert "[Minor] Organize imports to reduce warnings"

This reverts commit bd2d6aab47d28e6ca446f79afd2e39029b9d46c7.