resolves #384 rollback partial dep tracking until resolved