ANALYZER-2199-Backing out this change as it is not the correct change to
make to fix this issue
Merge pull request #1211 from rmansoor/5.0

ANALYZER-2199-Backing out this change as it is not the correct change to make to fix this issue