Convert #363368 to Flügger