Convert #364087 to Flügger