Revert "Relax Criterion constraints"

This reverts commit 7c5b7f5c76b6fc5aa9d8b32a0e4f55124101b122.