Convert #185039 to Flügger