Theft CCC's DepLoader
Match some recent changes in DepLoader