Revert "8/18/2014"

This reverts commit 53c23cd427c570d94c13ea12bfaf399015163314.