Convert #614928 to Flügger