Convert #264525 to Flügger