Convert #228338 to Flügger