Convert #226648 to Flügger