v3 -> v4: - Cleans up the commit message. - As the patch itself is unchanged from v3, I did not retest it.