backout: backed out changeset 2f2107c01dee (+1 change)
Following discussion on the original Phabricator patch, we've agreed to back out
this change until Python 2 is dropped since it's simpler than figuring out why
the Python 2 version doesn't behave the same.
The additional change is the one in test-chg.t since the error type changes back