v5: fix accidental removal of v3 changes in v4