Revert discovery object status optimization.

Merged Andrey Vertiprahov requested to merge fix-avs-rollback-object-status-optimization into master

Revert discovery object status optimization.

Merge request reports