Revert public_access configuration
Merge from upstream