Revert 10b545e..7c60371

This rolls back to commit 10b545e134093f7d79d1933f5b5078752f5ba0fc.
Revert 0b45da0..ae359a9

This rolls back to commit 0b45da024550aa1a772abffed54272db86d8284f.