Revert some old changes from mr.scotty that are no longer useful.