Revert "8/25/2014"

This reverts commit 197e4c2b3d3d804494642a57bf9527562e1564de.