Revert "Merging with Hang"

This reverts commit 8daa12c1089c19a3cb008f4569520d7a70ac3742.