Partial revert of unintended changes.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>