Revert "Original Commit"

This reverts commit 7488bbaca41622bc4b13530d7cbf44f36fdd6d9f.