Convert #264948 to Flügger