An index was added to the v1.11 branch to support the ORM query. Because the
index cannot be applied to v1.10, the query was rewritten for the 1.10.x
branch to provide better performance without changes to the database. When
1.10.x was merged into 1.11.x the rewritten SQL accidentally showed up. This
reverts that merge to use the original ORM query.