Convert #171237 to Flügger