Revert changes from previous commit. Previous logic was superior.