This reverts commit 4e89d98d4adf24059a193efd3fb7f1143a936c90. Several unit tests are failing after this commit.