Convert #266237 to Flügger