Reset correct dependencies for 3.0 branch