Convert #266387 to Flügger