Revert c413743..48f0cdb

This rolls back to commit c4137435960575fc3b1fe1a7b981649c8ffca33b.
Revert 48f0cdb..b4fb359

This rolls back to commit 48f0cdbaa589b22005b82c164ea7b3ae3596412b.