Revert 5c1c8ff..2cbfd9f

This rolls back to commit 5c1c8ff2c18d31f69de4c8bc078969d7da5773ef.
Revert 2cbfd9f..7ad8831

This rolls back to commit 2cbfd9ffd5f6917c6db86cabc046990624f6c6de.