Revert 4e30922..d43343a

This rolls back to commit 4e30922d0504a67d5c57d83cf2b21625be4493fe.
Revert 4682969..ccf7014

This rolls back to commit 46829697b93697a36904bd1b64be88060897dcff.