Convert #228537 to Flügger