Restore test for #83, fixed upstream