Revert "20130116"

This reverts commit 8ef831544869c99915a5984264da8ee0bf3c9479.