Revert "For ENG-5865, remove dead code that Ning found"

This reverts commit b846b711a602511b76e6c91da9000fccdd7229cf.