Convert #228838 to Flügger