rollback some changes
Merge pull request #566 from patriot1burke/master

rollback some changes