This reverts commit 6fb6eba9. This test breaks due to an incorrect import in the test.
mentioned in commit 3d86eebd