Not required if you .... <see the next diff>