Convert #266377 to Flügger