attempt to undo 86271e0

undo changes from github. i created this separate branch to show what the changes would be. it should only wipe out what i have here.