Revert b412799..326ba21

This rolls back to commit b412799be510686aca7e8896d2fa24780eb822de.
Revert f0d6536..5ae2332

This rolls back to commit f0d6536acc0c17b40bab475edf12bf5644b60369.