Revert "Added extra checks for ext storage class"

This reverts commit 9e9a5b9ea1f9b4699cf2d0c621f3f911f3639df9.

Unit tests weren't ready, need further tweaking.