Revert the change that blackxored mentioned in code review, until we have tests.