This reverts commit d9ef307e as it is causeing expensive check verification errors. Remove the test again until we can fix them.