Convert #228277 to Flügger