Convert #315285 to Flügger