Reverting cppcomponents