switch to vanilla CS for now