Add workaround for http://projects.puppetlabs.com/issues/16178