This change required a migration which was not included in 2.0.0. It's
not possible to backport the migration but since this change wasn't
absolutely necessary, it's easy to just revert this.
Signed-off-by: Stephen Finucane <stephen@that.guru>
Stable-Only