Revert "Removed Deprecated code."

This reverts commit 407dc22709fe0184bcd7bcd4d1c3d3f02fe675c4.
Undeleted some of the earlier stuff which was not actually deprecated.