Reverting cppcomponents.hpp