Variety reports Edgar Ramirez, the actor best known for starring in the acclaimed miniseries turned acclaimed super-long movie Carlos, will be replacing Gerard Butler in the remake of Point Break. Ramirez will take on the Bodhi role made famous by Patrick Swayze in the original. With Invincible director Ericson Core directing, it will maintain most of the overall plot of the 1991 version, but shift the focus away from surfing and toward extreme sports in general. No word on whether they’ll update the president masks.