Revert "20131114-1"

This reverts commit 550f499650e6117cb19aa9097a1d902bff995ec6.