Updated to work around shitty puppet recurse options