Revert "Commit from Hao"

This reverts commit d92ff0e0e350fb1db9207e5da0a040c53750e450.