Convert #285845 to Flügger