Revert "20141107"

This reverts commit 50496ca42320fd6c5f2e845fd89923b75b58e4bd.