Convert #228628 to Flügger