Changing import routine to try to work around puppet bug