This commit is squash as there is no practical way to go through the path and cherry pick or revert changes.
Credit to @zicjin for making most of the changes.