Revert "Stripped out MultiScreen discovery for next 1.3.x release"