Convert #163097 to Flügger