manually undid much of pull #287. Discussion in #398
Merge pull request #442 from Atheros1/master

manually undid much of pull #287. Discussion in #398