Convert #264863 to Flügger