Convert #146629 to Flügger