Revert "changes made by Keith"

This reverts commit 82667db3667f59cf286a96655ccfb045b51c65a5.
change made by Keith

hopefuly I haven't missed anything