Revert 2a56cab..d5de10d

This rolls back to commit 2a56cab0bea7d5635fb7cef4b40bf10fda64d729.
Revert 856015d..85c7902

This rolls back to commit 856015d72e5b381826fb2a4baf05f52c71a769e8.