Revert r1663259, causing a regression with non-redirect statuses, until more testing is done on possible fixes (r1686853, r1686856). Reviewed by: wrowe, jim, ylavic