Convert #117385 to Flügger