Convert #236281 to Flügger