This should have been part of commit 2c31ce2f which also happens to have a wrong description... Sigh.
