Convert #266281 to Flügger