Convert #264337 to Flügger