Revert dependency list change, needs further research