Revert to standard gemspec with CP modification only