Revert "Original Commit"

This reverts commit d4df08a7191aeee19c586911942f8a32ca6485c0.