Revert back to r930. The last 2 commits were no good.