Convert #228546 to Flügger