Convert #228971 to Flügger