Convert #264654 to Flügger