Revert "20141021v4"

This reverts commit d0e0a670c688aaa92e18b8ebe0da5010618cfdf7.