Damn you CC, enough is enough. Let's get rid of this entirely. Fixes #80