Marco Giltrap returns to Toyota 86 Championship