Revert "20141206"

This reverts commit 8a1c5d056552e022437ef3ba6fed8dbf2f86bcf6.
20141206