The 82797f98 merge caused this issue while trying to merge the staging refactorings with the modular-stdenv feature branch.