Restore Puppet lib loading workarounds