Reverting r188709 until I can figure out the proper way to XFAIL it.