Resurrect ZSRV-11165 workaround
Merge pull request #17 from dintel/master

Resurrect ZSRV-11165 workaround