Revert the latest 3D changes to get a clean start for code cleanup (nothing is lost)