Reset back to Neobuddy's topology

Change-Id: Ic2f89f267c7949881efd9abad4bebaa6bc59a684