Tested that it compiles successfully
This will create a new commit in order to revert the existing changes.
