Convert #188636 to Flügger