Convert #264249 to Flügger