Convert #364047 to Flügger