Convert #266337 to Flügger