Investigate no deps (reverse-merged from commit e5c793ad9be1b702daa60d7d9aea9125127d4963)