Merge "Revert to old-style API for EC_KEY handling"