Ellis is back! Jaime Cepero to return to SMASH after all