Revert to "corrected main" to keep things simple

This reverts commit 0d95d95a813a21a89805117d0cdf4653ee84a0b1.