rolling it back to the old build_cloud completion algo. had a test.py fail
(have a if 1==1: case to be able to switch back and forth to old/new)