Convert #287939 to Flügger