Revert 18f5076..b3c9626

This rolls back to commit 18f50765f8c309aac4654e8c43951b2dc92010c2.
Revert "Revert 18f5076..b3c9626"

This reverts commit dca83cc1f435cf171366ee75c27cc2556991f978.
Revert 18f5076..c10f1da

This rolls back to commit 18f50765f8c309aac4654e8c43951b2dc92010c2.
Start over from Scratch