Revert this patch, as it broke the test suite