Revert 0982535..d85ea6c

This rolls back to commit 0982535a819e595c045d85d6362dd158633c1c21.
Revert 21017bd..d32c89e

This rolls back to commit 21017bd1198646b21ab502d547445ec561e1f88c.
4.3.5