Revert "hury-2013-5-14"

This reverts commit 2029e438dbe27441f6d68b38c112e6bcfa97d1c1.