Convert #187285 to Flügger