Convert #228243 to Flügger