Revert d35994b..702cc00

This rolls back to commit d35994bb4ab9a88ba9293b4921cdac5eb80cfb72.
Revert 1d350b5..109c473

This rolls back to commit 1d350b58b129fa850e42870849c2641dd566cda9.