cpp: Moved runtime back