Convert #228382 to Flügger