Code

Partially revert commit 12758, because ACL evaluation does not work properly when...