Revert "20141018-2"

This reverts commit 842592608fc0d25f1075b482df0b0e3fa3b667da.