Convert #228879 to Flügger