Convert #264268 to Flügger