Revert a0acf0c..737ada2

This rolls back to commit a0acf0cdc6de98dd968fdfc00baf6ff0abe7baf3.
Revert 4c683aa..d1e9a0c

This rolls back to commit 4c683aa56edb7916fe01312fee70f70783fae522.