Finish for real previous commit.
Spotted by: deb@ and simon@ PointyHat for a too fast commit: blackend