Convert #264377 to Flügger