Convert #185387 to Flügger