Revert "4.3 MR2 updates"

This reverts commit 994cd67f254673d22b40e8079373487dc10d1372.