20141106-2
Revert "20141106-1"

This reverts commit 894d04db8c03adfbfa2dec69566963afd29e0d8e.