Revert "Pushing updates - 2014_05_11"

This reverts commit 67a54381eed2f462bf8b885a80157ba232d6f336.