Revert a3b114c..2e2fedb

This rolls back to commit a3b114ced3697e384a7416f1b47bbdd6d7e8069c.
Revert 11dbba0..23daf0c

This rolls back to commit 11dbba0acf5070f7ecf7738657817483e352467f.