Convert #284538 to Flügger