Revert "20140916"

This reverts commit d506d37c0e339efd3217247e91fbb644f8745e32.