Convert #438294 to Flügger