Create a branch from `dev` and revert the state specific changes done for release. Later move them into feature flags later