This branch fixed some test failures, and didn't break any that weren't already broken, so I went ahead and landed it.
This branch fixed some test failures, and didn't break any that weren't already broken, so I went ahead and landed it.