Completing fix for http://projects.puppetlabs.com/issues/15165