Convert #276336 to Flügger