Revert 9e70fe2..33f4c0c

This rolls back to commit 9e70fe22b6f17ee1cb3a13a0198eaf3b2031cd0b.
Revert 524d07f..701c1a9

This rolls back to commit 524d07f96c7ab7c15cc46f2da0d68b54a7670bdf.