file-has-acl: revert both recent changes, 80af92af and 95f7c57f