Convert #467481 to Flügger