Convert #264739 to Flügger