Revert "Cleaning out some cruft."

This reverts commit 13f911d4c54e68c90b2711ac7a3d6e82e9c031a5.