Revert a couple of changes in the spec because the code handles them better now