Revert 77dd118..895d4c1

This rolls back to commit 77dd11879bc1ae9108791176969dd9080bfb032e.
Revert 43b4364..d0eb373

This rolls back to commit 43b436400d15b7bf09d43fa103d2917894399960.