Revert "Crude changes"

This reverts commit 2506aec817229936313749edc44b0cdf17fbfa59.