Revert the change that breaks a test case

Recreated the PR from my personal folk