Convert #264039 to Flügger