All inquiries to fix the numerous regressions caused by this changeset were left unanswered. This reverts commit a73aa330.