This is a fixup of !1431 (merged)
This will create a new commit in order to revert the existing changes.