#7106 - enable fix for ZTS builds only