Forgotten changes to be commited in a67877db.