Convert #228294 to Flügger