Convert #284336 to Flügger