I've fixed this separately with a test in 467c9b9, so please update.