Convert #461879 to Flügger