Revert c6037ea..7edb5d7

This rolls back to commit c6037ea35905d73cf1114f5b797c507640f2324c.
Revert 38bed59..2b7cd54

This rolls back to commit 38bed5980427f597b7f94bcfbd6e9ef738101bb2.