Revert "20141031geon"

This reverts commit d38ae62fd2bccaade05f119645c61711efa89fe0.