Final fix to make us pass NULL SD test in RAW-ACLs. Not sure if this is 100% right...