old changes, catching up after git/libcurl bug