Revert all changes to main from v1.4.0

Since the parent of this branch is v1.4.0, we only need to merge main
ignoring its changes to this branch (the `ours` main strategy) to
effectively revert all of main's changes:

$ git merge main -s ours