Reverted some files back to same state they were in in Master branch.

Travis_CI build 120