Given the nature of the problem and a desire to coordinate with merging the patch for bug 1758347, I've taken the liberty of pushing a fix directly to master and rel_3_0.
Given the nature of the problem and a desire to coordinate with merging the patch for bug 1758347, I've taken the liberty of pushing a fix directly to master and rel_3_0.