Revert "20141227_1016"

This reverts commit 7ba18457d87af970463d3b60f5f2b8be02f9b885.
Revert "20141227_1000"

This reverts commit 52f00a5be2719663b036c7171fc48c9c616e4104.