Revert "Merged DJ into master"

This reverts commit 44ea044758d2a6e54c2d048c87823a89b4a5411e.