Convert #888317 to Flügger