Revert "First good commit"

This reverts commit 6f69544e043ac03d13f009684fba3b9f0661237d.