Convert #226237 to Flügger