Undoing some changes from the refactoring that were incorrect. 
Undoing some changes from the refactoring that were incorrect. 

Former-commit-id: 309e2b1b78f3efaca8ad38f4885d07a03131f688
UCBerkeleySETI/blimpy,UCBerkeleySETI/blimpy