Reverting back to the way the puppet.service file was in the original package
is also necessary to get the service running again:
ExecStart=/usr/bin/puppet agent --server=${PUPPET_SERVER}
--masterport=${PUPPET_PORT} --logdest=${PUPPET_LOG} $PUPPET_EXTRA_OPTS
This way the variables are apparently expanded at a later date and filled in
correctly.