revert gate from previous commit.  Still droppign you in random places.