This reverts commit e9a3d1a4. Seems the new FileCheck library doesn't link on some bots. Reverting for now.