Revert "05/29/2013/3:14pm"

This reverts commit 19900b977a9f299c80fd489037ceb010ba407134.
Revert "05/29/2013/2:52pm"

This reverts commit 69356da2a57e767cd1d0a1628e6a29d20ea21f73.