This reverts commit f0744a16755384732c5f54735d7aba9e5dc5954e.
Manual configuration should be necessary only in the rarest of cases.
Revert this in preparation for a more automated case.
Change-Id: I18902de42d95d9427165e6f8ffa6cab303ea62ca
Related-Bug: #1732630