Address nits, revert to pre-cohorting feature