Fixes #5805. This commit undoes a regression introduced by #5789. Signed-off-by: Jon Seymour <jon@wildducktheories.com>