Revert "20141106-5"

This reverts commit 9b4d39de62938604502013c0365f15acbd765897.