Unrevert the tests from r183298 as they pass with both old and new code