Fixes #1572

We don't use rawdata anymore.