Probably better to make this upgrade in a separate commit (so that it's clear from the commit history when we did this).