[refactoring] Changing back the previous version.