Convert #185238 to Flügger