Fix mistake in previous fix for T53600, shows we really need a smarter solution.
Fix mistake in previous fix for T53600, shows we really need a smarter solution.

tangent-opensource/coreBlackbird,tangent-opensource/coreBlackbird,tangent-opensource/coreBlackbird