Extend E2EE API support back to 6.0