Convert #264946 to Flügger