Revert "Attempt raw=true trick"

This reverts commit 8af224098932c62d1e8028af3c3d468226abdfc5.