Revert 7f6142f..f19b739

This rolls back to commit 7f6142fbfc24802745cfc42f8cf0afbb1d1674ff.
Revert 50bf059..3edd0d4

This rolls back to commit 50bf0598d0b6b5aec8ac2002d67a38d7f09f0de2.