Convert #348686 to Flügger