Revert b2cba4e..94df465

This rolls back to commit b2cba4e902279f3fcca2093e6d1b10d3c48b6c07.
Revert 4b37760..ebcf3c2

This rolls back to commit 4b377606b587ba4938f4bf447898bc79d3c3af0d.