Revert 8ed0413..cd01acd

This rolls back to commit 8ed041323d831bc93cf431a5a3d40fd7e471146b.
Revert "Final test for tonight"

This reverts commit 8ed041323d831bc93cf431a5a3d40fd7e471146b.
One more