Revert "20140711"

This reverts commit baf5834867c52c2f04b851e5f313bc4cf1071d53.