Revert "a crap load of changes from ezekeel and franco francisco"

This reverts commit ee632120d1f3e0753629e2aac19334fa45f21459.