Convert #335297 to Flügger