Revert "Resolve more N+1 queries"

DO NOT MERGE
Reverts YaleSTC/reservations#721