shim to revert to 3.6 within/intersects syntax