This reverts commit 72f769f494822981db6df9524b92a2d86f8e69fe. There are several test failures that need to be fixed.