Convert #264609 to Flügger