https://issues.apache.org/jira/browse/SENTRY-1093 After these changes are merged we will need to revisit and fix our code accordingly.