Revert "Minor code simplification"

This reverts commit 256abc904aaa8752d10dee7ca156d742e93e389c.
Add explanatory comment