Revert "two more var to vardir conversions"

This reverts commit ab234fb8da28347cd6aa93704191a87a25646f49.
Revert "removing data symlinks before creating them"

This reverts commit 57cff1ce62d137f12e5f9f96eeffdd20a013fec1.
Revert "fixing build and bundle to use the vardir option"

This reverts commit fcb99ef56e3c38ef6ad920bcd65af4a5c58f7862.
Merge branch 'master' into develop