Revert f074706..3bb1eaf

This rolls back to commit f074706750586751dc66ef76d51c0f98ecb56d3a.
Revert 76c77c6..ac02e54

This rolls back to commit 76c77c695226224cb8841d8804961e5747d06613.