Switch entity $data back to protected visibility