Revert bad merge
Update package.xml after reverting bad merge