Revert r1154 and instead apply the patch in cache_acls so that an error is