Reverting my packer changes - need more testing.