Because of my mistake in [8/10] the previous patch won't apply. Here
is the updated one. :-)