This reverts commit 9226424401. (cherry picked from commit d0437d5052092aca46e511e6a26042634326b113)
9226424401