Revert 7cd04ef..1cabd33

This rolls back to commit 7cd04efed95e6ba02e9fdc4011544a52a7a23b66.
201309241024

fix bug fail
201309241027

fix bug fail