Getting myself tangled. Roll back a moment.

This reverts commit 1c625a967d555db0f62c65c9f96e0858cbcec3d2.
26 files changed