Convert #266238 to Flügger