Reverted part of previous commit which broke Pkg.resolve().