Convert #264759 to Flügger