Convert #146409 to Flügger