Revert "Use .includes for eager loading of within_mx_range"

This reverts commit 42aa2595cf03465b34fcffe8689716d140a93c0b.