Revert "Use a temporary area tag for drawing. Fixes #1014"

This reverts commit 4184b503f96c462d38b896c4bff28902f6931f11.
Add area tag by default, remove when applying preset