Convert #264497 to Flügger