Revert "5-30-14 Update"

This reverts commit e9dddf95a2a086d41ff957b22d0eea495b6dfa4e.
oops