ZP-968 Revert "ZP-968 Partially undo changes of commit aeab7567. This prevents access to the volatile state to check if the state was already used."

This reverts commit c889767b.

Released under the Affero GNU General Public License (AGPL) version 3.