Revert "7/3/2014"

This reverts commit 186ed44f507603b3c2d29c6635bf9b16255d3f42.