This reverts commit c27253af63. The bug is fixed in ZK 5.0.10, so there's no need for this workaround.
c27253af63