Updated to work with puppet-bind pull #6.