Convert #286697 to Flügger