Convert #286348 to Flügger