Reverse 954f2d27, which I did not intend to apply to this branch.

Signed-off-by: Nigel Cunningham <nigel@nigelcunningham.com.au>