20141106-7
Revert "20141106-7"

This reverts commit 4a5ff6683b800168dde6b76784a081429902afb3.