Revert r221702 until I address Richard Trieu's
comments.
Remove this test too.