Revert "improved query efficiency"

there's a test ensuring temporal references are optional - not sure
whether that's still necessary, but this needs to be tackled separately
(and consciously)

This reverts commit 3ff3e94aad256a637eaf8d8fee52f141d2efe113.