Convert #286376 to Flügger