Convert #228068 to Flügger