Revert "Beta 20141128_2"

This reverts commit 1637969a5f40c198af032aef0935485a44e88e84.