Summary: This reverts commit 2ac19feb. This commit causes some test cases to run fail when branch is aligned.