Revert "Improved work with different compilers"

This reverts commit 9f20070b9e5d9fe32492c4936f9f9818c803203b.
Improved work with different compilers