Revert^2 "Always require opt-in for root/system"

This reverts commit 35cbe4dcd07a5d93c4bc6a368c2c9c5330a0f7b9.

Reason for revert: rolling forward - rollback did not fix flakiness issue

Change-Id: Iebaf786ee15954da1f8dd4fe64cc610fb76b4357
1 file changed