Convert #264241 to Flügger