should have been broken all this while, i didn't change this in this PR, just copied over the files from core..
This PR anyways is temporary, we can just ignore it .. i'll fix this in the CJS PR