Add missing fields back to work around Puppet bug.