Revert "Fix the compatibility matrix with range" am: a83bb3a647
am: 22e035ad72

Change-Id: I35572a969f48f9b7c5cde5fd305a9f59deb44624