Revert "refs #153 ported fix from gh71 branch"

This reverts commit b5c3115a00f8dcdd3c071dd9720e0a852d24081b.