Revert "Issue #2376839 by MiroslavBanov, nicrodgers, DamienMcKenna, agentrickard, joelpittet: Rewrite to use the new Drafty module - Added test dependency first." This reverts commit 2c91211d.