Revert "Update for 4.3"

This reverts commit 3a9684b6ed8c928dadf771c72b6939aecb1bb05c.
Revert "Update for 4.3"

This reverts commit 404ab573bc7af2916f16c8153f732bb4b665bd8c.