Revert 7f754ed..97c23cc

This rolls back to commit 7f754eda5cc881af25330d65b1eda22fc839c823.
20140210