Revert "EZP-21213: forgotten stashed changes from last commit"

This reverts commit 60a8556706dfa75f3bafbfafa0f18b6323a8933d.