It won't happen. In order for passives, CP, and sets to calculate restore properly, the basic weapon restore rules needs to remain unchanged.
And an option to restore both would be difficult to balance without running into the same calculation problems.