Convert #228589 to Flügger