Revert 9d027d2..2ed2e1a

This rolls back to commit 9d027d2e92a690bf2624eab345375d2ff0a0dac8.
Revert 2ed2e1a..d102614

This rolls back to commit 2ed2e1af124a6a7595d7cdac522fd3caa317f82a.
Updated d3ex