Rolling back that commonjs stuff because it didn't work