Revert "Add capability and unit testing for a blocking switch to manual mode from Serengeti"

This reverts commit 61b6f1fb8cd836b53c32b6bb6ac33d85e262cad8.