Convert #163377 to Flügger