Revert "Fix of 3D problems"

This reverts commit defcdf7897a3cd4862f584799c9d76325c36de87.