Revert "Commit20140708"

This reverts commit 001268231e16e8f1757fc1d790be3bd778cd094b.