Revert "Reconcile stuffs"

This reverts commit 252108ef104ec61e911481cc8e66e62a61c0b3f5.

Change-Id: Ia0b4d3f4a4c4115d3b3d6b89f8fcc50716e263a9