Godot-specific changes are undone in this commit, they will be readded and properly documented in the following commit. (cherry picked from commit 5681b7b60a)
5681b7b60a
(cherry picked from commit 2398eb6ed4)
2398eb6ed4