Revert "[Merge] From Unstable"

This reverts commit fef3d60fadf0e8c568b489b1089721b0d1720970.