Convert #161959 to Flügger