This work is in progress, currently in a branch called `raw3`. This will fix #1280 and #1272, which appear to be dupes of each other.