Convert #264251 to Flügger