Revert to 22

Because yeah.