Convert #264385 to Flügger