Revert "Corrections. Do not use yet. Untested."

This reverts commit a7f04942a63659c09784e8e3eafe3eaf2ee66a91.