Convert #264836 to Flügger