upstream: remove --block flag since api will always block now