Revert "Fixed compiler issue"

This reverts commit 3579fd8e6459c6010d41aa52d2df8b8ff74ee8d7.
Revert "ReBase 4.4.0"

This reverts commit de4561be85f1a8a3c98e9d5b2c0f43912efdb35e.