Revert "2014-11-08-5"

This reverts commit 2fc0dad552372e117b121dbfc39c5fefb5531237.