Revert "Small complexity improvement"

This reverts commit 7d377ba570e096b9b9821d1436312f313f49dd32.