Convert #228286 to Flügger