Revert "test20140818"

This reverts commit 7f92b41d7c2b78b386a26eabeab94b7cb25b361c.