Revert Draft mode dropping