Reverted cpp changes