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