Revert "20130113_18"

This reverts commit 801101b98e9081b9ef9536a8b802d058c5737dea.
20130121_01