Merge "Revert "Revoke 'always' web handler status when not autoverifying"" into oc-dev