The lazy logic was too oversimplified and produced a different result
than the one computed later causing all kinds of problems.

Closes #4013