Convert #236441 to Flügger