get rid of the c-s hack; didn't always work anyway