Revert "Final 7-31-13"

This reverts commit f715592f4036e3851e0399c2a643a1ab51c5070f.