Tony Stewart returns, will race Richmond