Revert "testraf"

This reverts commit 5862a101ab938ec96a80d0ea5caab4afec38a1b3.