Revert "Mangle everything."

This reverts commit 287c074c8b14631f310f35a97dbb22a4ffde1bb9.