Convert #236587 to Flügger