Revert part of #140

As discussed, this turned out to be redundant.