Convert #266429 to Flügger