Revert "4.3 MR2 updates"

This reverts commit 5a5b91058525ec5307a8a390bbf1bbc4928c54e1.