Revert "20140701"

This reverts commit cbb012dac38320926ad16a6202cc296ca04cfbde.