Revert "Resurrecting files lost in @#$%^&* merge"

This reverts commit e5b5bee7807d8af68c1ad3553aed371e4248b2b5.
Revert 0b71dd8..8686e8c

This rolls back to commit 0b71dd8b9aa2261b33a3763d758b90f9d44a4e58.