Revert "new case fix"

This reverts commit da7b463b7977fc08107bfb3d5be2176a9d2cd185.