Convert #228641 to Flügger