This reverts commit 32a572cecf. This reimplements the criteria overhaul in preparation for fixing a known bug.
32a572cecf