Revert "20140609RAW"

This reverts commit 44d4676a53c4db92701b7ec068bc63245ebedea4.
20140609addupload