Convert #228928 to Flügger