Client and Annotation layers no longer make server requests when disabled.