Merge "Remove package on which we cannot revert."