Revert "Revert "Local Only""

This reverts commit e1b20637ffefdc3ffdcd10313f12510f752cffb9.