Revert "make the following cases compile on VSC++"

This reverts commit d951aaf2a41b725b2b76cdfe53163ba3509ec909.