Revert 9861378..57f17d4

This rolls back to commit 9861378cb6cfaa8f64cd6ab7f860b89cd9cd0d66.
Revert 05a2c9d..ed13a99

This rolls back to commit 05a2c9d7647dd624078091d035dc7e92ec717830.