Probably -- for now, we can just revert this, since we aren't auto-testing these at the moment anyway.