Revert "[NORMATIVE] Fix dr preds when upsampling is enabled"

This reverts commit 1eb8f2d381634113d4537ff131d02382d5eb1293.

Reason for revert: May be incorrect fix.

Change-Id: Ic95d74ad4dd42a75808381eff3c7e667131b9ea9

av1/common/reconintra.c

diff --git a/av1/common/reconintra.c b/av1/common/reconintra.c
index 899ad42..21d1f60 100644
--- a/av1/common/reconintra.c
+++ b/av1/common/reconintra.c
@@ -524,7 +524,7 @@
   assert(dy == 1);
   assert(dx > 0);
 
-  const int max_base_x = ((bw + bh) << upsample_above) - 1;
+  const int max_base_x = ((bw + bh) - 1) << upsample_above;
   const int frac_bits = 6 - upsample_above;
   const int base_inc = 1 << upsample_above;
   x = dx;
@@ -598,7 +598,7 @@
   assert(dx == 1);
   assert(dy > 0);
 
-  const int max_base_y = ((bw + bh) << upsample_left) - 1;
+  const int max_base_y = (bw + bh - 1) << upsample_left;
   const int frac_bits = 6 - upsample_left;
   const int base_inc = 1 << upsample_left;
   y = dy;