Back out unnecessary change and fix up UTs