Convert #436198 to Flügger