This reverts commit ac0e62584f. This reimplements the criteria __focused__ commit in preparation for fixing a known bug.
ac0e62584f