Convert #228297 to Flügger