Convert #348454 to Flügger