reverted fix for Issue #69 until a more benign fix can be determined.