Convert #735339 to Flügger