Temp commit, try to get rid of AccessControlContext entirely