Convert #264186 to Flügger