Convert #438471 to Flügger