Convert #284867 to Flügger