Convert #266391 to Flügger