Resurrect ZSRV-11165 workaround