fix devhub regressions (bugs 847326, 847296)