Revert "fix up status (bug 888038)"

This reverts commit 57fdb97e29d16dee12ef074d1d0400231ff33dc3.