Revert "Status API changes"

This reverts commit a248a6656e715c180c6ca1778d137460fadf01e3.