Revert Main.cpp to bc874f
Pull from upstream