GTNWCI-43

-Remove previous patch which was no longer needed and was handling a symptom and not the actual cause.
-Update the tests for the other servers to test for this