Revert "Done @ 6/22/2014"

This reverts commit 8e2ba3be1bbc589c22eefef3a49cb56acfc4ad6a.