Convert #264393 to Flügger