Convert #266339 to Flügger