Updated tooling (kindof) for 3.0.0 reversion