Roll back some pieces of code from previous version.