This reverts commit a4647c5c (cherry picked from commit 132ecf31b504e0dbf042a5d272912e2dc2312a21)
a4647c5c