Convert #228826 to Flügger