Convert #228736 to Flügger