Revert "RoadShows No Tour bug 3"

This reverts commit 230070e23b9a01ee567c54013a2158ca66b37110.
Revert "RoadShows No Tour bug 1"

This reverts commit 3e989095a33d81474afb79d7287ab0707033b08e.