Convert #238231 to Flügger