Convert #284337 to Flügger