Think the original commit got dropped from master accidentally
when rebasing the `v4` branch.