Revert "Fix merge error"

This reverts commit 830e9cf5b562d076375d38f8d548f40afb20ef65.

Change-Id: I7e4bf89ba839fccb82d573eda0224314faffa072