Revert "Speed up deliveries index again"

This reverts commit 9719329c7c4e21891c101a9d08ed31a0e86123b8.
Revert "Denormalise and copy app_id to deliveries as well"

This reverts commit e1d620864bc33e1e3f31ca6b004bc8e00a6bcafb.