Revert "Build 16309"

This reverts commit ff1e4467ece2b727cbc2c657841c82fa9bb1aa7f.