Reverted changes to how root dir is resolved