Fixing an issue with OpticalLinkProvider and reverting some topo changes.

Change-Id: If57d529127323d0d2b0f8778ce68527de6284c77
4 files changed