Revert "RHW-2 stub that (hopefully) stops autoconnecting"

This reverts commit bf8407a7375ec593901a37278d1c202a3f95f637.
RHW-2 Anti-Autoconnect Stub

Copied original test stub to Lightrail-Dirtroad Intersection Solutions
instead; also added diagonal stubs
Undid changes with Rail-Dirtroad