Revert 32f55e1..50399b5

This rolls back to commit 32f55e11c9e2242593e73c97d1f94cf1c0782b8a.
Revert 5229af1..3f9063b

This rolls back to commit 5229af13988f4b631e5e13f55a1c87831f6bfc4b.