Revert "[CS] Simpler guard logic"

This reverts commit f709ab41e053957c327f4b49a748740bea0c2924.