New implementation properly handles the two sheets. Now the TargetSpace test passes again. Yay! [[Imported from SVN: r8375]]