Convert #285287 to Flügger