Revert "Revert "20140624""

This reverts commit 6ebe8a4f6cc4bc8fa8917dcb79b73202f04da36d.