Convert #735629 to Flügger