Revert "Use Blaze Persistence for criteria queries."

This reverts commit ab36adbbc22fcd156ddce528a9ff5e5103623342.

Change-Id: I335ec7d02bd0d53655ca4b07bed9ee4a0c01ce04
3 files changed