This reverts commit 3676b8dcc9d33155881085ebff6073c372dcd0c9, reversing changes made to 125533b36bd009b23f659a54d486d73d29081b4f.
BUG: 279356 BUG: 286116 REVIEW: 103284