Revert "Build 16826"

This reverts commit d47d4787ef41c6d864ec3b191dbb7ac2bc02fb12.