Convert #160381 to Flügger