align more closely to eval-puppet-site