Think I'd be inclined to delete DW's behaviour and apply WA's to the site. May be a bit of work but in the end it will make life easier for you.
I'd do a complete backup of the site as it is before carrying out any work. Then you can at least revert back if it goes pear shaped.
Perhaps someone else knows of an easier way but that's what I'd do.