Revert 1c3a1f0..cb3c197

This rolls back to commit 1c3a1f0c43475fc6fffbd1f3b253fd03f2182dbe.