This replaces and follow up what was discussed on !1898 (closed)
This will create a new commit in order to revert the existing changes.
