These commits broke regression tests, so I'm reverting them.