This change looks like entity will be ignored if a machine is specified explicitly.  (Also in the put / fetch variants.)