Revert "Merge branch 'JD's_Branch'"

This reverts commit 52c4670689a0c9312e1c6500d9199828b2501387.