Revert 30d3bbe..2d1a964

This rolls back to commit 30d3bbe118b077c8a892cdbca1536388e29ad767.
Revert 2d1a964..2fba3fa

This rolls back to commit 2d1a964ffda1a164f737b937d6f369c81710c355.
Header 1/19/14