Convert #614093 to Flügger