Revert "Update from 20141213 build"

This reverts commit fc0dcd6590ed1578432eeb0232f238df00c714ef.