Convert #264138 to Flügger