Convert #228268 to Flügger