Revert "Changes(8/4/14)"

This reverts commit 475a5b9c9abfc2b60d548d5ecffd2ad7ba6f17e9.