This reverts commit 4e1fe96. Reverting this commit and fix the tests that caused failures due to a35c64c.
4e1fe96
a35c64c