(cherry picked from commit 83ff00cc9338d93235f92a4df58282665f32c76e)
This reverts commit e31bffb62acdcc5b41af6d7feec21024ab590189, reversing changes made to d2186f2cd7ca09f9ee1688b58214d49594ce7ccd.