Revert "[Kevin Hu] Fix bug 996549"

This reverts commit 917f925b647b39b1e3a78e2e8b259e28f1af085a.