Revert "20141027"

This reverts commit ae5330977596304f9afcdadded87c14f2eaafc63.
Revert "Revert "20141027""

This reverts commit bdaa43df3a1cc2e5e87fc0bc0615b6031a80eccd.