Revert "JJake Update"

This reverts commit 408971996710e5c028ab7197f529e125fd63df5b.