Revert "version 2 raw"

This reverts commit 58442371355ecd4fcd5227205eee3c21377e6923.