This should have been added in Gerd's previous commit.