Convert #228846 to Flügger