Convert #264343 to Flügger