Rolling back last major pull request into an R3.0 branch for cleanup and restoring original codebase from R2.0 branch.