Revert "Newer" compilation problem

This reverts commit 274c31f3d609928d7b11c8f6c2109ed5bd765e56.
Revert "Include new updates" problem with compilation

This reverts commit e562dc39c01a01e360909cbc42d53ae18eae6054.