Restoring a number of apparently un-neccesary imports (generating
warnings) from being commented out.  Just in case.