Recommit 116056, now with the missing file...