17899 appears to fix this. At least for the case of using "pull all" in the CLI, and it shouldn't break any cases that were already working.