revert 187603d6 sa this break tests and cause problem with the grad in conjunction with the default value or on_ununsed_input.