CA-137829 CA-137959 Revert fix to CA-108676 because of collateral damage
Merge pull request #95 from stephen-turner/CA-137829

CA-137829 CA-137959 Revert fix to CA-108676 because of collateral damage