Convert #228906 to Flügger