Remove error-causing logic

Ensure that the problem is still where we believe it to be.