Tried to modify the partial workaround changes to bug #4179 - Signed-off-by Anusha Rao