This reverts commit b30abbdfb4.
Reason for revert: Changes are affecting DC' installation/bootstraping
Change-Id: I47d509afdb897d9064e603be9155277688bc02bf
This reverts commit b30abbdfb4.
Reason for revert: Changes are affecting DC' installation/bootstraping
Change-Id: I47d509afdb897d9064e603be9155277688bc02bf