This is a partial un-revert of 32dd5870 (originally df09f825 ). I'm adding back the baseline tests first, so we don't have to back-track as much in case there are still problems.