[aws|gcp][fix] Revert __init__.py changes (#1791)

[aws|gcp][fix] Revert __init__.py changes (#1791) #362