Convert #228394 to Flügger