Convert #228237 to Flügger