Revert "Fix Dracon's 2nd epic fail"

This reverts commit 88c78856af3957b3b1c597d06169b8642479c517.