Convert #146337 to Flügger