To be merged with kernel!109 (merged)
This will create a new commit in order to revert the existing changes.