Revert "Revert "8/18/2014""

This reverts commit 01c0961c168a097b92a482a9026b6ae62d6e2754.