revert parsing/networking changes not related to cloud stuff