Convert #276629 to Flügger