Convert #286486 to Flügger