Resolved OBANYC-1624: Inferred State/Phase Discrepancy in Admin UI
Revert "Resolved OBANYC-1624: Inferred State/Phase Discrepancy in Admin UI"

This reverts commit 621cc1e44657865d37075b929afda60a169c24c9.
Revert "Revert "Resolved OBANYC-1624: Inferred State/Phase Discrepancy in Admin UI""

This reverts commit a334468ef30bc90531333e7a22ef88eccc2ed557.