Revert "Fix isset issues"

This reverts commit 8c3331d42320751ca3b62f62e76d5aa0825beb78.