Convert #236284 to Flügger