Convert #164358 to Flügger